Use g_warning() for X errors and X IO errors

Currently fprintf(stderr, ...) is used for X error and X IO errors
(unless compiled with debugging, in which case g_error() is used for
X errors.)

But if an application is redirecting log messages, we really want
X errors to appear in that same log, so it's better to use a g_logv()
variant.

Though g_warning() isn't really appropriate for "lost connection to the
server", G_LOG_LEVEL_INFO isn't part of the "prefixed log levels"
so will produce output without the application name and PID.

https://bugzilla.gnome.org/show_bug.cgi?id=630216

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index db8175cb1bf91d3a2113cd8dcece8c5f8a5e1511..f15da8b80c6a53db301470ec0fe17f4425fb8359 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2751,7 +2751,7 @@ _gdk_x11_display_error_event (GdkDisplay  *display,
 #ifdef G_ENABLE_DEBUG
       g_error ("%s", msg);
 #else /* !G_ENABLE_DEBUG */
-      g_fprintf (stderr, "%s\n", msg);
+      g_warning ("%s\n", msg);
 
       exit (1);
 #endif /* G_ENABLE_DEBUG */

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index ca20f973045f0474008982da5a262406d4ee9667..c71e189aa037ffd517eae7d6bdb15a3bb7a4d3ee 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -318,19 +318,18 @@ gdk_x_io_error (Display *display)
    */
   if (errno == EPIPE)
     {
-      g_fprintf (stderr,
-               "The application '%s' lost its connection to the display %s;\n"
-               "most likely the X server was shut down or you killed/destroyed\n"
-               "the application.\n",
-               g_get_prgname (),
-               display ? DisplayString (display) : gdk_get_display_arg_name ());
+      g_warning ("The application '%s' lost its connection to the display %s;\n"
+                 "most likely the X server was shut down or you killed/destroyed\n"
+                 "the application.\n",
+                 g_get_prgname (),
+                 display ? DisplayString (display) : gdk_get_display_arg_name ());
     }
   else
     {
-      g_fprintf (stderr, "%s: Fatal IO error %d (%s) on X server %s.\n",
-               g_get_prgname (),
-              errno, g_strerror (errno),
-              display ? DisplayString (display) : gdk_get_display_arg_name ());
+      g_warning ("%s: Fatal IO error %d (%s) on X server %s.\n",
+                 g_get_prgname (),
+                 errno, g_strerror (errno),
+                 display ? DisplayString (display) : gdk_get_display_arg_name ());
     }
 
   exit(1);